Moving some properties around, continued tweaking.