Bug Fixes and remove member