Drop some stuff
Type system fixes
Change some things in types.rs