changes recommended by realair and other misc stuff