Added lots of assets, some bug fixes

I don't remember what the fixes were.