minor changes
almost ready