More improvements- especially syntax.