Corrected constants
Model notes and testing new solver