Fixed some issues with assets (large commit)