Version3

Fixes #18 
Fixes #17 
Fixes #16 
Fixes #11 
Spaces after the commas on this line and the next few lines.