full project files now load correctly; did some minor refactoring