latest changes, fixed up stuffs as desired

Signed-off-by: franszo <franszo.design@gmail.com>