More work on assets, along with some cleanup