fixed a few critical bugs, reduced ugliness of the solution, started doing interpolation