fixed janitor bugs and happenings