HACKLOG-3 Fixes for syntax, logic, etc