More clean ups
Add cheatsheet
Quite happy with the current status