More minor changes, still not removing comments for some reason