fixes and exploration

Corrected many issues. Optimised calculation time. Began explorations.