More tweaks to the output (it can now compile)