Updated a few things. Also Freelix, check the todo!