Addition

Adding methods. Minor bug fixes.