comments, a few tweaks here & there and added missing files