bump to 2.0.2 and merge of all packages I fixed or workarounded