finished some more methods