Bug Fixes and Added Main Level Old