fixing some stuff on how assets are handled in the code for the build
merge