remove certain things and added stuff

[permalink]