adding more exceptions, cleaning up create-site