many changes for better CI handling