added use_grav switch, + some cosmetics codewise & output wise