Started fixing some things