Fixed up and added some stuff

Added a little easter egg too, feel free to look at the code to figure
out how I did it ;)