made calls private, so they can be safely extended. couple minor bug fixes