Fixes, comments, readability