Clean up, some fixes.