Added 3 week calendar and tweaked BT update code