Made some small improvement
Added some TODO's