It seem to be working - fixed inteface bugs