Pre-deadline fixes and commented debug snippets