mark some methods public, more defensive code

mark some methods public, more defensive code #605