Various updates
fixes
Fancy plot