Increased timeout, bug fixes and never write data when offline