Makes the number of weeks printed in calendar be 6 when necessary, fixes...

... #5