Fix comment
Fix models/stores init
Fix models