Merging Santi's and Adrian's and sprite update

So that everything seems to look a bit more polished.