Fixed some issues, pull review raised.