Fixed controls. Working on the bug with mis ordered nulling