Added time restraint
improvements to reports coreection and more