baasman minor bug fixes