Fixed optional arguments bug with empty strings
Fixed some minor parsing issues