Improved homing, style changes