Fixes and improvements

Signed-off-by: dragon <dragon7780@hotmail.nl>