GCW-Zero 0.2.1

GCW-Zero changes for v0.2.1 working build.