Correct last interfaces (..I think..)
Fix errors. Like a BOSS!