fixes and suggestions