bits and pieces changed here and there