Added comments / minor fixups