Product improvements and fixes #1