add security box return, remove z at reset, minor changes