new feature(s) and clean up