minor tweaks and corrections
another minute or so