added and edited things