Finished CTF for testing

Fixes for other borked things