fixed few minor issues