A lot of small changes and new functionality