minor fix and cleanup
make customization conditional and leave for the weekend