Bugfixing and Small tweaks