Minor improvements & adjustments

Going to use renderer rather than surface.