First Upload Bug Fix Bug Fix!

Fixed some new bugs made when I fixed the old ones!