updated calculation
updated calculation on store
removed some stray debug puts