docblocks and fixes for validation