tweaks with lauri
after feedback, more changes
edits and updates