Various updates

Including testing figure elements