fixes and rmovals