Bug fixes. Additional Comments