c* commands and misc bugfix