fixed up fuel property
added new properties
removed lambda function because of shoddy c++11 support in gcc 4.5
fixed lamda issues for older gcc