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