add ignores for generated modules
fix conflicts
fix for datainput
fixes for package