Minor error correction & basic offline mode added