Fixed various things I couldn't itemize off the bat