minor bugs and lint