WORKING Some small tweaks