addedsome tweaks