Fixed shit bugs