FIX:Some things I forgot to commit the last times