Some fixes/tweaks and new dist files