v3.6.1 --- tweaks and bug fix
prep for upload