big structure changes, finished screensaver