Bug fixes the argv problem, as well as some minor syntax issue