Typo in last commit: fixes*. Almost done, all I need to do still is to evaluate 5 b.