Fixed bugs and added more customizations