minor fixes...needs some cleanup of course.