even more bug fixes
fix commands