changed one comment, doesn't seem to work, maybe roll back
minor changes