Fixed CTF up quite a bit