some fixes
trying to pull
minor fixes