Ironed out some bumps