fixing syntax, tabbing issues