Final commit

A bunch of changes and new assets.