some small changes
ADD some TODOS