more fixes. (committing frequently to avoid duplicate fixes)