Added example; Fixed some issues