2014.10.20b

Refactored some stuff.