updated common stuff from other projects