bugfixes, sanity checked commands