added infinitism + + renamed stuff