Updated multiple features; will have to be more specific in later commits