Major improvements, drop calc support for now