Started fixing some stuff