Bug Fixes and working on Daily actoin list