Add a few more commandds
Fix errors