adding small fixes