more develop fixes