bump to 3.2.1 and build cleanup