updated CHANGELOG
fixed docblocks