-Fixed minor bugs occuring on rare conditions

Dissertation:
Finished dissertation