update to v 6.0

renamed some fns, cleanup doco