Autoloading fix, code cleanup, ready to do booking