fix and stuff