Cleaned up some code and added XKCD to my branch