Fixes and suggestions