Clean up & minor bug fixes.