safety commit
some bug fixes