Made 'type' automatic for systems; fixed links