Made some small tweaks