+ minor bug fixes