Merge pull request #35 from amychiu/amy/development2

delete and other fixes