Most stable version of code in a while. 

Caught a couple bugs, now doesn't crash in offline mode.