add store and fill
Minor fixes