chiark / gitweb /
rename variables, make it compile, fix error handling a bit