Fix minor things. Also, Rob can you document your previous code?