added plus-data directive, code cleanup
merge