fixed some hard coding and typos in main