Asset cleanup, bugfixes

Cleans up asset library.