Updated comments with fixes for bugs.