Lot of fixes and customization