A lot of changes.

Signed-off-by: mgolab <mgolab91@o2.pl>