3.3

autoclose;, significant refactoring