Little changes + Bugfixes