Cleaning up, fixes.