some tweaking/cleaning up of features