added strings as parameters and fixed some minor issues