fixing database & assets