small changes to allow easier use in other projects