FIXED minor issues