some fixes, add cheat sheet