Going through and knocking out some bugs I noticed