added validations
fix body indending