Fixing 364dfaa

Some files weren't updated correctly.

Addressing #135 and #136 in the process.