Updated some things for easier deployment