Adding more comments, fixing some stuff up.