First/Second assignment more bug fixes