fixes and debugs removed