bug fixes and more command support