small fixes according to jeffdonahue