Added assets and some misc changes