fixes and pieces