new updates and code fixes