1. Message on data upload added
2. Bug fixes