Little stuff/bugfixes