fixing all the code sections