Fixing stuff

Correcting incorrect comments, adjusting code for new data structure,
getting everything working.