updating old changes and fixes