some fixes/updates