Cleanups and new features