some fixes & documentation