Small tweaks and changes as suggested by client