Adding AutoClose... and other stuff.

Looks like I failed to actually commit my latest additions to my modules
here.... oups.