cleanup and minor tweaks

also added a screenshot