little adjustments to the final version