Test and bugfixes
Commit