Finish comments

Notes on the ugly hack