A few BugFixes
Thanks for pointing me Sira Cuervo (AxxionKAT)

A few BugFixes
Thanks @siracuervo for pointing me...