Slight improvements, working towards 1.3