- minor features and cleanup