Many improvements on offline mode but few bugs remains