command handler part 2

Converting the 'internal' commands to 'regular' commands.
Some fixes too.