Improve graphics + various fixes