Fixed parameters and some documentation