minor bugs remain