Fixing more Stuff, no more compiler warnings and simulation now actually works