beta
1. improve calendar look-up - custom renders, etc.
2. some clean-up

Signed-off-by: semteacher <semteacher@gmail.com>