Assets revisited, minor bug fixes