fixed all the stupid errors