Small general fixes. Preparing to add Firework command.