Begin improvements
Merge. Bugfixes.