Some controller fixes and current ebuild for the git version