fixed bugs, added assets