improve calendar display?

the -'s for placeholders seemed kind of unnecessary
also, fixed empty weeks showing up at the end