Default values refactored
some bug fixed