Fixed various parameters and string generation