fixed some bugs and missing assets