Made some minor tweaks and fixes