data preparation chapter completed + minor fixes in control management