Merged and fixed small issues