Fixes and code cleanup
Code cleanup && a new "easter egg"