Crystal prs to be reviewed

@ErikSchierboom, one of the approaches + the prs for analyzer will I delay to be reviewed until next week since I have to do a bit more qa.

I’ve gone over them all.