add caching
add comments
update FB module