fixes and bug resolutions