1.9 fixing minor bugs