Bock

Sorry man, been awhile, been all over the place. Have some incremental changes as I tidy things up for final push. Started with these, and will update functions within "R" next.