update: bunch of fixes, improvements and new features