made some updates and changes