added more screens, cleaned up some bugs