improve performance a bit by more precise string matching before parsing
bring up to recent rust nightly
add support for 'type' statements