Steve, see this thread (in case you have missed my 'spam'). I've addressed both issues.