Changed constants and removed prints
Moved and added data and plots