minor additions & style mods