Some suggestions and fixes

Just a few changes. :+1: