clean up methods. fix destroy. add more options.