Analysis update

minor bug fixes
Effects updates