Added bch changes to Main from vasp2gss