Fix bounds... almost (except Tanzmaus)