Bug fixes, added an eye