Internal changes
Bugfixes, some new features