new parameters and bug fixes
merge polymer branch