Updates pulled in from secant hackfest work