fixing menu's, pointers, structure