quick fixes
progress

almost there