Added the bug fix commits and updated