Added a plethora of formitudes
Fixed Merge Issues