big cleanup, upgraded to bleeding edge before packaging