just a few small fixes/changes