Bug fixes, improvements of frontend