Implements step into and fixes bugs