Additional fixes and some TODO implementations.