fixed basic controls