Fixed shit, added new shit