Vacation over. Now the tradtional dilema of balancing bugfixes, new features and tests.