Clean up whitespace
Fix regression in x axis labels

Weeks are numbered starting with one, not zero.