some teaks and build process changes