Fixed the suggestions made by maxnordlund

Or, at least I think I did. If I have misinterpreted what you meant,
then please clarify what you meant.