Added few fixes & made stuff look a bit better
merging, added a few changes
added easter egg