10/30/13 Working

Fixed minor bugs. Up to managing comments. Everything is currently
working