Fix Issues with commenting