Fixing redefinition error.
Fixed red.
Few more various changes, nothing major.