Final fix

it all now compiles and is compatible and stuff :D