Bugfixes, new commands