Got those 2 annoying issues fixed. Next week I can start "fixing" that major issue again by rewriting the whole thing from scratch (I do have some work already done, to be fair). That seems to be the very last thing I do for that project, as I will start in another on February 20.