changing default value to 1500 and some small tweaks