fixed some features; added new elements