more little fix's and syntax changes/formatting