partial assets cleanup, some bugfixes