Some fixes + reference the cheat sheet