fix things based on leon's questions