Start with everything on the public facing side (ie: anything NOT in the admin folder structure). If your calendar is now showing up and appears to be functioning OK in the browser on the checkout page, then take a close look at the class files to make sure no modifications were missed. As you are combining mods this is likely the case.
Bookmarks