UI updates / Added hit count / Error handling