added some of own customizations to the main branch