small misc changes: