updated various + removed trash