fixed table issues
refactoring
fixing issues from review
updates
updates
removed conflicts
final for this iteration