Next Iteration

 * clean up
 * more docs
 * refactoring
 * bug fixes