more parameter tweaks, layout, and refactor