fixxes, comments, todo's and some refacs