some fixes; more customizatoins