Improvements for #27, what not fixed issues were added as TODOs