Cleanup, fixes, improvs