Multiple bug fix.
Review effects
Add samples