Fixed some hard-coded stuff

had some hard-coded stuff in that was for test purposes, set it to more
permanent values.