orders fix. comments fix.
UI fixes
some changes
unit testing
Merge branch 'yurembo'