general changes and updates