Fixed lot's of minor issues