fixed small issues mentioned by Jas