Fresh Start
Fix some stuff