with assets plus fix some minor bugs