Fixed two bugs and updating data directory