A few bug fixes before I go to bed. V0.35