+ controller refactor changes
+ fix for eyedraw import code