fix report commands
work in progress