feature fixes and cleanup