Improvements, fixes and moar.