update the patch, small fixes, uncrustify etc