Small fixes, added TODO's