Added a bunch of pluses
Merged changes from myself