Moar changes - rst again