Final fixes, spacing, comments, log output