Bugfixes

brickoderequested to merge
(removed):bugfixes into pregmod-master

Also updated the sanityCheck. It doesn't currently work, so if you want me to remove it, let me know.

Merge request reports