hole work and bug fixes