Semi working version (By DreTax)
Fixes, A few very minor errors