Fixing bugs and list of work items from discussion