tweaks

@maxmurdoch can you review?