- finally got around to commenting most things properly