minor fixes and better system import from system type
minor fixes and better system import from system type