10/28/14 (reordering bugfixes, phew)