master: fix, improvements via rebased kernel

Rebased to e210s KK source

Signed-off-by: arter97 <qkrwngud825@gmail.com>