Renamed some variables. Changed definitions for some default values.