Clean up code to allow proper compilation
Add code for Twist in the Tale 2.4