committing a bunch of stuff i did not commit  since the last time i worked on this. to lazy to find out what it all is :(