more customization and fixes