LOTS OF FIXES/MOSTLY COMPLETE