Adding some small improvements and adding some todo's