Added contact renderer and fixed some bugs