Autoclose v0.2

Fixes crash and confusing names