Bug fixes and added correct columns