Multiple improvements and fixes

See bitbucket account for more info

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