all green, a couple of fixes