Some bug fixes was done