Fixed TODO's, added TODO's, fixed exceptionmessages etc...