starting to fix bugs from the cleaner rebuilt code