minor fixes with last develop (0.2) modifications