Cleanup, improvements, fixes