adding orbits, several other updates