Slight fixes in the main sp file, but lots of changes to include/freak_fortress_2.inc