~ minor bug fixes