Update- fix some issues