Added more functions

We added a few new functions, but are also working on option panel that
needs some improvement.