update src and win32 bin

minor formatting and misc changes