Bug fixes, new commands