smact_core merge completed/tidied