small changes, mostly for testing purposes