Add black9 tweaks

Thx to black9 :)