Update 0.2 (1.6.4)

Update to 1.6.4, cleanup