fixes, recomendations