+minor bug fixes