Fixes, additions...

Did some work here. but its a good amount which I cant really remember
^^;