Fixed some quircks and found a compiler diff.