fixing some parts of code