performed some general modifications