Well the good ol' computer finally died on me today, hurray faulty batteries!
Hard drive is okay though, so it's going to be about a week until I get it back. However I have the good old (slow) PC at home that I'll be using to start getting back to work this week on things.
I'm thinking about just starting a new universe and copying things over. From what AP has told me, I think it might solve some of the issues we've had so far.