rAKA/bugfixes%2Fcorrecting-for-newer-compilers

features/solver-rewrite