Add Guff
Fix cursor focus, for realz this time