added some final tweaks