Fix buggy temp shapes. Fix rectangle.