refined docblocks and fixed {