got some silverstripe stuff smoothed out