some fixes for some of the suggestions