Update master with latests major bug-fixes

Fixed major class integration problems, class name conflicts, useless interfaces, and code typos.