additional fixes and time plots