Cleanup

Fixed some silly stuff I forgot.