Minor updates

A version that works on my machine