Improvements

cc @calvinfo @ianstormtaylor