Improved features & bugfixes