Added / fixed some more methods