+ minor bugs