* minor bug fixes