Fixed minor errors, deleted orig files