fixes for new ST and a whole lot of whitespace