Small changes + bugfixes