added more updates and customizations