simplified and fixed some reST bugs