Various simple changes, playing around before serious changes ensure