It is still WIP, as the Jam isn't over yet. Hope you will come back later, to check the diffs
It should be better now, if you wanna give it a try