add BiMap
date formating
minor changes