Update with things implemented and some extra features