some small fixes/changes