updated asset structure and a few other things