new features & bugfixing