updates
more stuff
more fixes
fixed some more bugs