Adjustments and fixes made to asset.c, few other things