some minor design changes/addings