Bug fixes from Project 1

Exterminated some bugs from Project 1, so the expansion will be cleaner.