Added some small tweaks