lots of changes
More features added to wish list