Better formating of arguments
Some fixes