Fixed a couple of bugs and updated assets