Add examples, extend commands, fixes and clean ups