fixed shit and stuff