fixed camera behavior, added calculator