Added user requested tweaks

Check the changelog for release 1.1.1 for more information.