Working ores & cleanup of code.