Bug fixes for reset_plants

Some cosmetic changes too