Minor fixes
Ditched partial matching and that 'strict' thingy