Nick and some fixes.