Added gas mode, improved test1, changes from yesterday