renamed functions, adjusted buffer-local settings