fixed indentation
small fixes
merge