added screen transitions, removed more unused code, and more