merging in code updates/fixes/etc