minor bux fixes after testing