Fixes, graphics, other stuff

Lama
Merge branch 'master' of https://github.com/and3k5/Matador