Fix for some stuff

Fixed it
Finished except bug?

Well shit, looks like tinaun will have too help