Merge / Cleanup

I merged some of the options I had from the jciinc functions file and
added doc blocks for each function.