fixes in sw addition