Some Fixes + Initial KAT Import (not working)
Merge Web Fix into branch 'Pistachitos'