More fixes/improvements to Planet