Squashed multiple commits

Signed-off-by: Dragon7780 <Dragon7780@hotmail.nl>