small changes, mostly packaging