a few fixes

fixed a few things