minor edits to a few classes, fixing a few errors/bugs