fixed formatting, added/change comments