mod: minor design changes