Fixed data fetch and other minor changes