DONE fixing remaining issues.