Fix some bugs and add an Easter egg