Fixed copy-paste error
Fixed few errors