rendering and matching complete, time to fix some bugs