general fixes/updates