Added some parameters, renamed some variables.
Added some parameters, renamed some variables.

See summary

cntnboys/302-project,cntnboys/302-project,cntnboys/302-project,cntnboys/302-project,cntnboys/302-project