updated some guff, read the TODO for next