Minor updates based on further research