woops, fix method names and add some comments