cleaned up filesystem, merged changes from remote
fixed bad d3 reference