small fixed, updates, customizations