small fixes. wappu commits