Small changes/bugfixes
fixed