Added controls and fixed update handling