fixed errors in Planet'
Merge