bugfixes and some new commands