sync Integrate

tons of bug fixes