Small changes

small fixes/cleanup