Various tweaks and CTF
Fixed those pesky flags