some comments, a few little tweaks here and there