addressing all the little tweaks and mods requested by client