minor bug fixes #13