fueling resource and some refactorings

tested in the last few weeks with the app and website. all seems stable.