changes and bugs