Even more fixes, cleanups and features