add comments
implement remix & scramble
Merge remote-tracking branch 'origin/development'