fix block; wip
finish token users work; minor fixes

allow token users to make updates
create mechanism for tokens to expire
improve external user interface
fix search to reflect recent changes
fix everything