serveral small adjustmands and preperation for camelimport