more housekeeping + title change