Fixed some things..... still a lot to test/fix...