Oups
Better typo support
WIP lots of stuff