fix/update: improvig the overall quality of the library