small fixes and extras