small fixes
Smae basic bug fix