Fix different method arguments a little
Update TODO