tons of changes and fixes, first step to render something
clean up/main screen