small fixes, cleaning up comments