Working on API & some fixes to enable production mode of app