fixes made to asset loading..still needs work