Added nexus system, other improvements