Fixed recursive struct problems and stuff