Fixed many errors
Revert "Fixed many errors"

This reverts commit 1dca4d0686bcca29c524c58582e44937a974008d.
Merge remote-tracking branch 'origin/master'