bits missed by initial commit - dammit