fixes and clear