bug fixes and added table