minor changes
Alpha almost ready