Small Items fixes
Added Some Offline Support