merged in Isaiah's changes & removed stale comments