After testing, minor changes/bugfixes