Rendering fixed, cleanup
merged from origin
import fixed
delimiter changed to ',', kmenas fixed