Fixed the not optional parameters and other small mistakes