Fix some technical things :wrench:
Finish Future Store review :department_store: