Remove half-arsed set stuff. General cleanup of comments, formatting.

Left a few notes to self about future improvements.