lots o' changes: my nb dashboard stuff and tobi's stuff

see individual comments