New features. Some bugfixes