Fixed some last TODO's, before beta testing