better implementation of dynamic reports
small fixes