Adds starring/unstarring in phase 2
A few miscellaneous fixes