BETA 4 minor changes, bug fixes