clear up minor bugs