add and cleam up comments