and more calcbot fixes