Added calc features and neater print