major fixes on everything to match stratasan