Cleanup, meta fixes, small fixes