indents to spaces
merged and added stuff