finally fixed rendering! looks good so far