Add fullbright hake

Also tidies up the source