changed store from class type to module
cleanup and some small fixes
(incr_i with or without transaction)