more progress on 2.0 conversion
merge with donggyu/master; init values occasionally fail to get code genned properly