Some fixing/groking left for the shapes