clean up and extensions, few new major SO elements