Add month filtering, misc. code improvements