Made a few minor tweaks and fixes