Added fixes. ready to use.