few fixes and fixed indent