I'll do a few fixes to this PR myself.