Fixed some stuff, made program easier to run