minor fixes...and (sloppy) checkin my hardcoded intervalls from last week