Level 2 update and planet fixes

Yup