Fix and improve features