small bug fixes. now validates in astrid