minor changes
solver!