FIXED TODO'S and some adds