Eden/controller improvements

:+1: