Small modifications
Bugfixes