Cleanup, fixes, extensions