deleted some stuff, commented on others