fixes and new updates