clean up and update for zenb00k