A bit of optimization and a bug fix.