many last minute updates and tweaks