Some fixes, documentation, added proper command calls and names