minor bugs / changes