got things aligned and working properly