Product update

Product improvements and bug fixes