updates and fixes, advanced partially done

Signed-off-by: Kwpolska <kwpolska@gmail.com>