final fixes, job tomorrow