Implemented missing features

See title.