One line function definitions added back to docstrings.
Make and setup improvements.
Special cases treated, pointers incremented in loops (as opposed to adding i).