housekeeping

few major changes