add bonds fixes and better controller