merged everything so far

More wrong indentation.