and ... more calcbot fixes