Organization, bug fixes, and an easter egg