201301 update

Hope to fix the inventoriable options bug

TODO: state tax reimplementation