Fixed some bugs that were really getting on my wick