correcting minor issues after testing, #5, #6