Finally section with some general improments