Fix bugs, remove unnecessary patches, final review