Small changes, attempted bug fixes.