bugfix and simplified eye device