Fixed stuff that git broke

now it looks sad :I