Finally got \cref to work
Fix some more \cref stuff