all done
lib file
minor tidy