bug fixes + updated terminations
Clean ups
Merged