fixed all commits. EVERYTHING is alright. yay!