added some recent amenments, made small changes