Fixed n(r) bugs and made N --> n