indent bugfix
and more indentation