Minor changes + bugfixes