fixing a few issues after round one of feedback