wrapped drawings in figure environments, small changes and additions