Offline 70% done. Fixed some other bugs