added test
tweaks