Cleaned up through VASP calculations.  Currently testing.