01 2014 beta fixes

Hey. Here's some work! A lot has been changed. We might just want to give it all another (live) test before we demo it.