FIXED minor bugs